Merge
authorKeir Fraser <keir.fraser@citrix.com>
Mon, 9 Aug 2010 17:29:50 +0000 (18:29 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Mon, 9 Aug 2010 17:29:50 +0000 (18:29 +0100)

Trivial merge